Cherry pick #3490, #3491, #3484 #3495
+34
−21
We went looking everywhere, but couldn’t find those commits.
Sometimes commits can disappear after a force-push. Head back to the latest changes here.